Make XEN_DOMCTL_getdomaininfo return shared_info_frame in gmfn not mfn.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index bf6b8473aa2bfd39ce78ba2df51fdd3f074485e8..b05ecd1099b604cece4bf8276fd7217039b4eff2 100644 (file)
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -126,7 +126,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info)
     
     info->tot_pages         = d->tot_pages;
     info->max_pages         = d->max_pages;
-    info->shared_info_frame = __pa(d->shared_info) >> PAGE_SHIFT;
+    info->shared_info_frame = mfn_to_gmfn(d, __pa(d->shared_info)>>PAGE_SHIFT);
 
     memcpy(info->handle, d->handle, sizeof(xen_domain_handle_t));
 }

diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index 37618ad827061fd48aa88e0832a11222b453f093..da0b5b286843049a0bdbcb11421f8d82aff41c9b 100644 (file)
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -93,7 +93,7 @@ struct xen_domctl_getdomaininfo {
     uint32_t flags;              /* XEN_DOMINF_* */
     uint64_t tot_pages;
     uint64_t max_pages;
-    uint64_t shared_info_frame;  /* MFN of shared_info struct */
+    uint64_t shared_info_frame;  /* GMFN of shared_info struct */
     uint64_t cpu_time;
     uint32_t nr_online_vcpus;    /* Number of VCPUs currently online. */
     uint32_t max_vcpu_id;        /* Maximum VCPUID in use by this domain. */